From: GPSBabel <gpsbabel@users.noreply.github.com>
Date: Sat, 22 Dec 2018 18:59:25 +0000 (-0600)
Subject: Merge branch 'master' into atoi
X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~115^2~1^2~58^2
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=894bb91c6ddf9e2c2e95a52ea3d177c047d3798c;p=gpsbabel.git

Merge branch 'master' into atoi
---

894bb91c6ddf9e2c2e95a52ea3d177c047d3798c
diff --cc cet_util.h
index 623084589,40810cd1c..d864e4f64
--- a/cet_util.h
+++ b/cet_util.h
@@@ -61,8 -63,10 +61,8 @@@ const char* cet_convert_string(const QS
  
  /* gpsbabel extensions */
  
- void cet_convert_init(const QString& cs_name, const int force);
+ void cet_convert_init(const QString& cs_name, int force);
  void cet_convert_strings(const cet_cs_vec_t* source, const cet_cs_vec_t* target, const char* format);
- void cet_convert_deinit(void);
+ void cet_convert_deinit();
  
 -void cet_disp_character_set_names(FILE* fout);
 -
  #endif  // CET_UTIL_H_INCLUDED_